From 2b0ffdac075935bba833acb2c077165865688875 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Wed, 10 May 2006 00:42:23 +0000 Subject: [PATCH] make the _CUPS_MAP_ATTR_STR macro not dup the string so we don't leak 2006-05-10 John (J5) Palmieri * modules/printbackends/cups/gtkprintbackendcups.c: make the _CUPS_MAP_ATTR_STR macro not dup the string so we don't leak --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ modules/printbackends/cups/gtkprintbackendcups.c | 7 ++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 740affe934..ac1a9d3be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-10 John (J5) Palmieri + + * modules/printbackends/cups/gtkprintbackendcups.c: + make the _CUPS_MAP_ATTR_STR macro not dup the string so we don't + leak + 2006-05-10 Francisco Javier F. Serrador * gtk/paper_names.c: Correct #11 Envelope typo. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 740affe934..ac1a9d3be1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-05-10 John (J5) Palmieri + + * modules/printbackends/cups/gtkprintbackendcups.c: + make the _CUPS_MAP_ATTR_STR macro not dup the string so we don't + leak + 2006-05-10 Francisco Javier F. Serrador * gtk/paper_names.c: Correct #11 Envelope typo. diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index 81819300da..ed4d95a7ac 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -58,7 +58,7 @@ typedef struct _GtkPrintBackendCupsClass GtkPrintBackendCupsClass; #define _CUPS_MAX_CHUNK_SIZE 8192 #define _CUPS_MAP_ATTR_INT(attr, v, a) {if (!g_ascii_strcasecmp (attr->name, (a))) v = attr->values[0].integer;} -#define _CUPS_MAP_ATTR_STR(attr, v, a) {if (!g_ascii_strcasecmp (attr->name, (a))) v = g_strdup (attr->values[0].string.text);} +#define _CUPS_MAP_ATTR_STR(attr, v, a) {if (!g_ascii_strcasecmp (attr->name, (a))) v = attr->values[0].string.text;} static GType print_backend_cups_type = 0; @@ -632,7 +632,7 @@ cups_request_printer_info_cb (GtkPrintBackendCups *backend, /* TODO: determine printer type and use correct icon */ gtk_printer_set_icon_name (printer, "printer"); - + state_msg = ""; loc = ""; desc = ""; @@ -649,9 +649,6 @@ cups_request_printer_info_cb (GtkPrintBackendCups *backend, _CUPS_MAP_ATTR_INT (attr, job_count, "queued-job-count"); } - /* if we got a member_printer_uri then this printer is part of a class - so use member_printer_uri, else user printer_uri */ - status_changed = gtk_printer_set_job_count (printer, job_count); status_changed |= gtk_printer_set_location (printer, loc); -- 2.30.2